Remove deprecated code from GdkGc

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index ba7b6fe51bc57e5b6806fb90f60ec60687ed2b14..432d8e7fd6b48b876b09caac388f611b2f87dc2d 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -522,16 +522,12 @@ GdkFunction
 gdk_gc_new
 gdk_gc_new_with_values
 gdk_gc_get_screen
-gdk_gc_ref
-gdk_gc_unref
-gdk_gc_destroy
 gdk_gc_set_values
 gdk_gc_get_values
 gdk_gc_set_foreground
 gdk_gc_set_background
 gdk_gc_set_rgb_fg_color
 gdk_gc_set_rgb_bg_color
-gdk_gc_set_font
 gdk_gc_set_function
 gdk_gc_set_fill
 GdkFill

diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml
index f5a16d35c700849d1c7fdc42098f373b0d8cd28d..7d445ede7a715647e577288e9bab6e8b4419df52 100644 (file)
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -148,33 +148,6 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_gc_ref ##### -->
-<para>
-
-</para>
-
-@gc: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_gc_unref ##### -->
-<para>
-
-</para>
-
-@gc: 
-
-
-<!-- ##### MACRO gdk_gc_destroy ##### -->
-<para>
-This function is obsolete and should not be used.
-</para>
-
-@Deprecated: Use g_object_unref() instead
-<!-- # Unused Parameters # -->
-@gc: a #GdkGC.
-
-
 <!-- ##### FUNCTION gdk_gc_set_values ##### -->
 <para>
 
@@ -230,15 +203,6 @@ This function is obsolete and should not be used.
 @color: 
 
 
-<!-- ##### FUNCTION gdk_gc_set_font ##### -->
-<para>
-
-</para>
-
-@gc: 
-@font: 
-
-
 <!-- ##### FUNCTION gdk_gc_set_function ##### -->
 <para>
 

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index e58a3fafff09cdcddd8c282c9099f842d9478c1c..a38d3a5238adca02e0d5207cebf74a886df79c0f 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -588,11 +588,6 @@ gdk_draw_layout_with_colors
 gdk_gc_new
 gdk_gc_get_type G_GNUC_CONST
 gdk_gc_new_with_values
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_gc_ref
-gdk_gc_unref
-gdk_gc_set_font
-#endif
 gdk_gc_get_values
 gdk_gc_set_values
 gdk_gc_set_foreground

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 42dc712270466d2baef1229018f495104c479bbd..fbdfb6d5ed23f751802aba09318fa872cf2b9bd7 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -222,36 +222,6 @@ gdk_gc_finalize (GObject *object)
   G_OBJECT_CLASS (gdk_gc_parent_class)->finalize (object);
 }
 
-/**
- * gdk_gc_ref:
- * @gc: a #GdkGC
- *
- * Deprecated function; use g_object_ref() instead.
- *
- * Return value: the gc.
- *
- * Deprecated: 2.0: Use g_object_ref() instead.
- **/
-GdkGC *
-gdk_gc_ref (GdkGC *gc)
-{
-  return (GdkGC *) g_object_ref (gc);
-}
-
-/**
- * gdk_gc_unref:
- * @gc: a #GdkGC
- *
- * Decrement the reference count of @gc.
- *
- * Deprecated: 2.0: Use g_object_unref() instead.
- **/
-void
-gdk_gc_unref (GdkGC *gc)
-{
-  g_object_unref (gc);
-}
-
 /**
  * gdk_gc_get_values:
  * @gc:  a #GdkGC.
@@ -409,29 +379,6 @@ gdk_gc_set_background (GdkGC             *gc,
   gdk_gc_set_values (gc, &values, GDK_GC_BACKGROUND);
 }
 
-/**
- * gdk_gc_set_font:
- * @gc: a #GdkGC.
- * @font: the new font. 
- * 
- * Sets the font for a graphics context. (Note that
- * all text-drawing functions in GDK take a @font
- * argument; the value set here is used when that
- * argument is %NULL.)
- **/
-void
-gdk_gc_set_font (GdkGC  *gc,
-                GdkFont *font)
-{
-  GdkGCValues values;
-
-  g_return_if_fail (GDK_IS_GC (gc));
-  g_return_if_fail (font != NULL);
-
-  values.font = font;
-  gdk_gc_set_values (gc, &values, GDK_GC_FONT);
-}
-
 /**
  * gdk_gc_set_function:
  * @gc: a #GdkGC.

diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index c64d2af5b4df1105a8e55b211f8a4271782f5ece..8681faaf7ee0ad4c997e1acde017e585f5b761f7 100644 (file)
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -226,11 +226,6 @@ GdkGC *gdk_gc_new_with_values        (GdkDrawable      *drawable,
                                   GdkGCValues      *values,
                                   GdkGCValuesMask   values_mask);
 
-#ifndef GDK_DISABLE_DEPRECATED
-GdkGC *gdk_gc_ref                (GdkGC            *gc);
-void   gdk_gc_unref              (GdkGC            *gc);
-#endif
-
 void   gdk_gc_get_values         (GdkGC            *gc,
                                   GdkGCValues      *values);
 void   gdk_gc_set_values          (GdkGC           *gc,
@@ -240,10 +235,6 @@ void   gdk_gc_set_foreground         (GdkGC            *gc,
                                   const GdkColor   *color);
 void   gdk_gc_set_background     (GdkGC            *gc,
                                   const GdkColor   *color);
-#ifndef GDK_DISABLE_DEPRECATED
-void   gdk_gc_set_font           (GdkGC            *gc,
-                                  GdkFont          *font);
-#endif /* GDK_DISABLE_DEPRECATED */
 void   gdk_gc_set_function       (GdkGC            *gc,
                                   GdkFunction       function);
 void   gdk_gc_set_fill           (GdkGC            *gc,
@@ -293,9 +284,6 @@ void         gdk_gc_set_rgb_bg_color (GdkGC          *gc,
                                      const GdkColor *color);
 GdkScreen *  gdk_gc_get_screen      (GdkGC          *gc);
 
-#ifndef GDK_DISABLE_DEPRECATED
-#define gdk_gc_destroy                 g_object_unref
-#endif /* GDK_DISABLE_DEPRECATED */
 
 G_END_DECLS